Add missing NULL check.

	* gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check.

diff --git a/ChangeLog b/ChangeLog
index 7548153bc92d68342f19f646fcdc58dc4e14c82c..a49f94ef4e517409ab34425dcef06b95756fc199 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-28  Darin Adler  <darin@bentspoon.com>
+
+       * gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check.
+
 2002-03-01  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32): Remove

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7548153bc92d68342f19f646fcdc58dc4e14c82c..a49f94ef4e517409ab34425dcef06b95756fc199 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2002-02-28  Darin Adler  <darin@bentspoon.com>
+
+       * gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check.
+
 2002-03-01  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32): Remove

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7548153bc92d68342f19f646fcdc58dc4e14c82c..a49f94ef4e517409ab34425dcef06b95756fc199 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2002-02-28  Darin Adler  <darin@bentspoon.com>
+
+       * gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check.
+
 2002-03-01  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32): Remove

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7548153bc92d68342f19f646fcdc58dc4e14c82c..a49f94ef4e517409ab34425dcef06b95756fc199 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2002-02-28  Darin Adler  <darin@bentspoon.com>
+
+       * gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check.
+
 2002-03-01  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32): Remove

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7548153bc92d68342f19f646fcdc58dc4e14c82c..a49f94ef4e517409ab34425dcef06b95756fc199 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2002-02-28  Darin Adler  <darin@bentspoon.com>
+
+       * gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check.
+
 2002-03-01  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32): Remove

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7548153bc92d68342f19f646fcdc58dc4e14c82c..a49f94ef4e517409ab34425dcef06b95756fc199 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2002-02-28  Darin Adler  <darin@bentspoon.com>
+
+       * gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check.
+
 2002-03-01  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32): Remove

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7548153bc92d68342f19f646fcdc58dc4e14c82c..a49f94ef4e517409ab34425dcef06b95756fc199 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2002-02-28  Darin Adler  <darin@bentspoon.com>
+
+       * gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check.
+
 2002-03-01  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32): Remove

diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 99534e19a47402cc22d536e418d506ed6730ff51..c8c2df3707afd006a5aab0766c45174e1d19122d 100644 (file)
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -2948,7 +2948,8 @@ open_new_dir (gchar       *dir_name,
        }
 
       sent->entries[n_entries].entry_name = g_filename_to_utf8 (dirent, -1, NULL, NULL, NULL);
-      if (!g_utf8_validate (sent->entries[n_entries].entry_name, -1, NULL))
+      if (sent->entries[n_entries].entry_name == NULL
+         || !g_utf8_validate (sent->entries[n_entries].entry_name, -1, NULL))
        {
          g_warning (_("The filename %s couldn't be converted to UTF-8. Try setting the environment variable G_BROKEN_FILENAMES."), dirent);
          continue;